Fix element lookup