fix issue #55
fix issue #54
Revert "fix issue #55"

This reverts commit bff93eb5a7e3f10f3c2d56e17c5fcbb2406b17e1.