Revert "fixing line #128"

This reverts commit fd69c5353b4cdc93f1f58b2219629e9dad8d6653.
fixing line #129, and #140-142