#671 - BZ 691562 fix