Updated $call to support substitutions for issue #20 post in the issue if this causes problems