Revert "fix issues #1 . #2"

This reverts commit 9f887e367763841238509249b85edd4b7f2fe4bc.