Fix JIRA # LRA-157 ticket issues