BUG FIX: improved stability of tracker