Removed circular dependency in assets
Actually fixed the circular dependency this time