fix fix and more fix