Fix drawing v2