fix cnp bug
Merge pull request #1327 from edx/e0d/fix-cms

fix cnp bug