ENG-5645: handle skinny