Fixed issue #132