Data checking & fixing is now working