Fix generate list