overflow fix part two ;-)