Fixed issue #207