ebb9154 fix part2