Increase macro safety thanks to @freestyl3r