ENYO-2577: re-indented