Fixed CoreFunctions