furhter fixes on edit mode