Removed return in server code :thumbsup: