fixed per piece issue