Fix issue #155