fixed bug with editable or non editable fields