Bug fix of Issue #12