Another hotpatch for undefined variables.