May have fixed a null object