Fixed issue #206