Fixing a bug introduced in the last commit