Try to make the magic more selective to avoid spurious matches. (Joerg Jenderek)