fix bug where substitutions getting skipped
fix bug where substitutions getting skipped

glennhickey/hal,glennhickey/hal,glennhickey/hal,glennhickey/hal,glennhickey/hal,glennhickey/hal,glennhickey/hal,glennhickey/hal