fixes + CALLs