Fixed #4863 (macros not propagated)