Fix cm.mk not being called (2/2)