see if this fixes null pointer