Should fix null pointer