Fix double lookup