#gt-68 fixed