Fix draw handler a bit