Fix in tracker
Fixes #555