Additional overflow fix

Should help with #129.