CRUD fix