3.0.9 fails :(