Fix multiple draw bug