Fix for Tracking

Closes #34