Further update to {CALL_ENTERED} macro so that it still works
in toggleMode