Fix drawing and state isssue