Revert "add a bug..."

This reverts commit 5bbfc493d568d429ebb777de0a0c56addcf9eedb.
Merge branch 'mc_m1_2'