Fixes #121. Tracking to util class