#GT-926: fixed