Fixes #2124 Tracking Logic Wrong