[Server] Attempt to fix concurrency issue...!