Moved update of projection to pre-broadcast call to avoid ordering dependency issues