Fix issue #153