#gt-260 fixed