Overflow-x nasy fix (again)