Fix no draw validation