Fix issue #206