WIP to hep debug issue with fills drawn incorrectly