Prevent cleanup step from truncating arrays