Improved stability. Fixed bug that freezed the server