Fix bug on initial propagation