workaround for current bug in time-aware code