Fix a bug that stopped CIS and CGRS working together properly.