Fixing bug on the server