Added fix for host index