Fix THIS_VERSION clobbering