Bug 0000001 fix