Unbreak core data weirdness