fix empty schema bug
merge