#TRACKER-29: fixed