Change order of cpzone check
Merge pull request #355 from bcyrill/cp_patch5

Change order of cpzone check