Issue 2844 timemachine issues