Rewrite for >= 3.2