Fixing broken shit (again)