Fix issue #209