Fixes #24: Fix for double list lookup problem