Fix macros listening enable/disable bug