Fixed match safe codes

July 8, 2019
fixed match safe codes