fix crud operations