Fix CRUD