Rover to TGT bugfix