Fixed bug on server