Namespace fix in conditions