Fix issue #205