Temporary fix of namespace issue.