bug fix. when 0|1 entries