Revert "fix6"

This reverts commit 0d0182a7f835952aa1993724f23da29579a38fb1.
Revert "fix5"

This reverts commit fb3c6dbc3971c8591cc889379b16d44ef21f17c8.
try to fix fc