Fix match expression