added a case for None