fixed waits in server