Fix for CP to use common-help