JFG-589 fix