Revert "fixed bugs"

This reverts commit bb1a4e7646c4bb2b8bc4d5ca9df21719fd4bce46.