GenID bug fix, take 2.