fix asset handling