Rewiring at this stage is easy... I think it is better to do it right and fix that now. Yes, there are ways of fixing it even in Mach3 configurations, but why?