[BUGFIX] Proper treatment of external assets

Fixes #346