Experimental fix for new variables...

git-svn-id: https://plugins.svn.wordpress.org/cformstable/trunk@989250 b8457f37-d9ea-0310-8a92-e5e31aec5664