One more fix to the server