change & fix