fixed null problem