fix Draw