Fix double assets
Fix double assets (v.2)