#GT-2 fixed