Fix indecisive schema again