Fixed core data related crash