Lookup Bug Fix