Fixing future times failing