#GT-533: fixed