Revert "Fixed issue #82"

This reverts commit 228eeee4a88bd0a1b001134656e2528fa295b812.