still trying to fix null pointer panic