Oops, this should work back to 1.0.7