additional overflow fix
Fixed merge conflict