Fix match to return the second variable