fix core calls