fixed missing substitutions