Bug fix of Issue #208