(Hopefully) fixed the bug that occasionally crashes the server (was unable
to reproduce)