added special case in tracking