Sub fix
Merge pull request #937 from Withoutatrace/substitute

Sub fix