#gt-299 fixed