Fix from Salvatore to fix project macros