Rewrite for overflow