Fix regression from when we updated CM. See #192