fixing data emit