Fixing bug created in previous commit