Revert "broke matching e vars"

This reverts commit 4ea739ef111f770865d13c862778bf7e84b08d59.
found why I "broke matching"