fixed random null return thing