edit Mode fixed