fix and conversion