This must be at least 1.0.4