SERVER: fixed crashing issue