Incremental fix to match as implemented