Temporary fix to resolve possible namespace collision