LRA-187 improvement