bug fixed

http://r.itcreativoff.com/issues/6883
http://r.itcreativoff.com/issues/6884#change-53166
Revert "bug fixed"

This reverts commit cb3ecb17eb318670d27e2af2e23b144a55724a0d.
commit
Revert "commit"

This reverts commit 00bfce344013e7cb0f3e459102df3ca1004b9fae.
commit1006

commit1006