Fix everething