Improve AssetsManager logic stability