Fix draws being displayed incorrectly