#GT-883: fixed