added check for until if interval is set