Fix for errors introduced by previous commit