Fix asset scheme logic