Apply fix for 0.11.x