Fixed big bug with propagating