Attempt to fix CRUD issues