Revert "Fix issue #125"

This reverts commit e015fa13544f6f8a8ef6bacbf435a7da975b2b76.
Fix issue #126