fix internal calls