removed dirrrrty hack from loop_entry_list