Fix #404
Merge pull request #405 from VertNet/feature/trackerEnhancer

Fix #404