fixed arrival_period handling