Fix missing variable substitution