Server side crash is finally fixed