Yes, I will change this to 'null'