Fixing another macro