Fix to create table