fix Issue #209