BUGFIX: Server crash fixed