Fix issue #181