Fixed draw bug