trying to fix the server end