Take two on assets-fix