Server crash fix