closes #1864 offset and limit from the timemachine changes