Added a fix for granularity not being respected