[SQUASH ME] fixed cnp fail