Bug fix of Issue #3