Fixed Issue #206