fix TODO about rollover potential problem