Fixing a bug introduced in last commit