Checkout Delivery/Order Comments

Not sure if this is actually a bug or how the system is designed but on Step 4 (Delivery) & Step 5 (Payment) on the checkout the same comments box displays on both sections.

Shouldn't there be two separate comment boxes or even just one?

For example

1. Special Delivery Requirements (e.g Bell doesn't work, please knock loudly)

2. Order Notes/Comments (e.g Please can you draw a dinosaur on the pizza box).

Thanks

J