In this case I would suggest to leave the macro as is or do you see a better solution?