JFG-589 Second fix (with bean, without interfaces)