#gt-61 fixed