fix and more fix