Improve switch mode between walk and put flag