Fixed bug when not using table