Re-added TimeRange
Fixed possible ArrayIndexOutOfBoundsException