Attempt at fixing corruption 1