Ha you're right. My rescue covered over the failure in logic there.

On my phone now but will have time to tidy up this afternoon.