Fixed the null problem thing