implementing brstgt's saved state parcelling fix