Proper fix for server reset