Fix issue #151