bugfixes on subset calc