Fixed issue #208