Fix for the community grid issue identified by Xavier.