Back to the previous coding way (using the macro with the goto).