Fix issue #183