assets + assetloader fix