fixed function call conflicts