Bug #0000099 fix 2. commit