Fix to spawn tables