one-to-one fixes