0.11.X issue fix