[HB,CB]{test after code} Bug fix