Fixed edit Client