Tried to fix the null object