hopefully fixed generate