Change logic whether to skip first step arriving

Change logic whether to skip first step arriving #287