Fix #132
Simplify package matching