Fixed edit issue