Bug Fix: Syntax correction for correct substitution