Issue #715 namespace resolving fix