Quick fix for server side crash