Fix JFG-399