Non-Variable eMatch
Finally fixed eMatch to work with variables