Revert "issue132"

This reverts commit 88f024cf5e9ea822ce2fcddbba45043222e19c52.