Fix transitions (especially on manual triggering)

[tomasztomys]

[tuanthieu2993]

Thanks @tomasztomys,

Would be better if you could please give us what happens that lead to this changes and how could it solve it as we could hardly tell what's the problem here