Alternative fix for #2 (as the earlier caused a dual handling of
None assets)