Closes issue #427 in UNL-CMS