Fix works only for v0.10.x