Server crashing fix