Fix saved state parcelling