#GT-956: fixed