Merge pull request #83 from m5/hotlist-fix