finally fixed the client/server desync with the drill