GT and JT fix