Manual merge of previous commit:

https://github.com/Warkdev/server/commit/e72f29960d543b0d082fc9f0b6ec6b4c4fa1f138