fixing possible namespace conflict