Fix draw states