working on fixing schema corruption