Should work now
Merge pull request #356 from nicolas-f/fix/tracker3

Should work now