Fixed pick block issues