More refucktoring.
Fix.