Performance fix for server