fix and change