Fixed NO_DRAW not being set correctly FIXES #25