fix for undefined time + remove toast for in range