#gt-26 fixed