Temporary fix for delete/update issue