Fix disintegration bug