fix replace
fix misc
fix mistake
fix