Improved overflow