fix for cm build