stable-1.0 last fix.