Need to apply baseDrawTracker

Fix to something I did incorrectly.