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