fix state not keep bug
merge