Revert "Bug #2 Fixed"

This reverts commit 7f4f1bcd5a9b1673c889aebbeae406988f6cc567.