#GT-891: fixed