Next attempt for 0.10.0