edit attribute fix
refactoring