Fix JIRA #LRA-137