[#68017354] change flow