Fix and test for JIRA item LEXEVS-669