fix from leonhedding check destination doesn't start with alphanumeric
Merge branch 'hotfix/v2.0.4'