Hi @mjchadwick,
We have fixed this issue in 'https://www.drupal.org/node/2876...