fix support for core data