Yup - you are absolutely correct! I was just updating it to check that (after seeing the code updates).
Works a treat now:
