Fix asset management [1]