fixing data issue