fix function class due to namespace issues