Fix ridiculous error, extract common touch set manipulation