Fixing the inevitable bug introduced in the last commit