fix it up (2/2)