Fixed #6 for assets.