Bugfix handling multiple assets