Fixed a bug where broadcasted variables where propagated too early