Has anyone done a self correction for an employer who mistakenly made 401(k) contributions (deferrals and match) for non-union employees to a union plan? The employer would want to move the accounts from the union plan to the non-union plan. Is anyone comfortable with this approach? The mistakes have been made for about 18 months (so under 2 year self correction period).