null problem fixed