4 previous commit worked - 'next unless match and..' uncommented