additional overflow fix