Core data fix in progress