Correcting Problem with Versioning Macro