Fix bug when not using subset