Fixing macro issue with lambda