Update: Bug fix of Issue #4