Complementary fix to previous commit