Fixed a problem with CDMI