beginning of errorfix, not done