fix logic in page 2
fix logic in page 2