Fix and fix and fix that shit!