JFG-589 new bug fix