Added overflow fix.