Fix issue with track drawing