Fixed for HN layout changes