fixed editability issue