Fix redefinition of functions