Fixed issue #135