fix and adjust