Bug fix of Issue #10