added fix for demand set expansion