Fixed bug serverside