bug 2470 fix