fix some functions
unknown conflict