Secondary fix for 0.9.x