generation methods fix