Fixed Tables to function properly