readd v0.11 support