Better rollback behaviour