core data fixed