fixing for server