some fixes on the granular collection