The On-The-Fly saving needed this really...