support 1.0.15 changes