#942 - make editable