Another attempt at fixing the corruption