JIRA EV-5: Tested and revised.