Fix SMART collection. Used a temporary fix to make it work