Fixed broken Core