fixed rare crash and changed time window