Fix issue #150