fix DDL order