Fixed issue where macros couldn't be called twice