Hotfix for a server crash, hopefully... (I can't test server in my current setup, need to get that fixed sometime)