v0.11 compatibility