Revert "Repaired bug"

This reverts commit d35c7ed0634a3a5bbb526d1a91baa0cbef9a204c.
Repaired bug #2