Argh, this really shouldn't be needed but is.