Fixed edit and create