Hi @TommyM, @jtwings and @Bilal -
Have you all reviewed this forum thread yet?
It seems you are running into a similar bug that these users have - please review this topic for a workaround:
Sam