JAL-3829 attempt to fix my changes to follow the Jira issue