#TRACKER-18 and #TRACKER-19 fixed