Fix subset creation.