#GT-1046: fixed