I'm glad we're finally sorting this out