overflow fix #2