fixed issue with server
fixed issue with server