Try again to fix horrible errors