Fix for time estimation when using the previous workaround