support 1.0.11 changes