Edit action fix