Better fix for handling case of no draw enabled