HB: simplified the list check