Fix problem with namespace clashes with line