Fixed table creation lockup... I think