Fixing bugs on video events when master changes