- Fix for a recently introduced bug