Fixed for v0.9.1.x