Fixes data emission and double update bug