[BUGFIX] Proper treatment of external and standalone assets

Fixes regression described in #293.