Fixing broken shit