Small fix to make CPM work