better?

--HG--
branch : dev
simler logic with continue

--HG--
branch : dev
merge of dev