Fixing bug with default value