fix deleted_at bugs