Fixed bug: client code on server side