bug fix for gen 1