function call fixes