Cosmetics for #319