Fixing all the madness