Fixed bugs reported in 100015 case