fixed table issues