Compability with 0.11.1