actually fixes null bug