Fix drawing switch