last fix for v0.9