Tweaked overflow behavior