Fxing more bug

Data issue may have been solved due to this….