Attempt to fix Core Data threading crash