Second attempt at 3.0.8