Attempt at fixing live updates