Now ignores 'None' type