Fix issue with hydration order, fix issue with hydration callback being triggered multiple time