#TRACKER-28: fixed