fix: bugs (#6552)