[BUGFIX] Special treatment for raw assets