fix to null problem