Fixed null problem