Fix edit feature