fix, fix, fix and.. fix