fixed changes for user_defined functions