Fix and test for ENUNCIATE-819