fixed the crash bug
fixed value match