CMDI Generator bugfix