[BUGFIX] Proper treatment of external and standalone assets
Merge pull request #299 from bjo3rnf/assetfix

[BUGFIX] Proper treatment of external and standalone assets