Fix match index