Fixed server side
Closed #202