Quick fix for server crashes