Fixed value wrapping order (#478).