fix fix and fix