Issue #209

Fixed Issue #209