fix a bug of trying to get the default target of a non-arg derived element, which is fixed by adding a check before doing that
Merge branch 'master' of https://github.com/fredfeng/Scuba