Fix up drawing for a better end condition