Fix core function