gen2: bug fix