Bug fix - table bug identified by udupa