Fixed issue #200