Stricter check
Merge pull request #111 from RWOverdijk/hotfix/lookup-bug

Stricter check