Hopefully fixed command drawing