reformat defer
defer fix then