Finish scanColumns patch