[Bug #7506] Change overflow bhaviour