Fixes #3 - Handle Substitutions the good way