Bug fix for drawing while navigation