Edit issue fix