TODO: no None objects in generator