fix for new cgmms, I think its working now...