Bug fix of Issue #13