Pre-1.0 fix.