Fix and test for ENUNCIATE-819

http://jira.codehaus.org/browse/ENUNCIATE-819