Fixed issue with server locking