Support empty prefix name #7