Fixes server crashes