WC-448 #comment Editing fix