Fixed up dealing with 32 items