It isn't perfect, but it is what you need to do.
You can incorporate those notes in the new version if you want.