Fixes bug 970406 r=peterbe