Fix for #1094

Timerange fix