Fixed #TRACKER-25 and #TRACKER-26