better "generated" handling