Fixing bug added by last commit