apply hotfix by Hans for bad clig substitution

reference:
    http://www.ntg.nl/pipermail/ntg-context/2013/072536.html