Debug - but realised it was the UI where the Return had to be hit for both fields (not expecting that)