Bingo! Deployed this and works as expected.