Bug fix in hmp feature building 2