Support macro patch #2