fixed table
fixed null problem