@PAUL_HIGG you mentioned that you are running 8.4. This issue was fixed in 8.5 which we just began shipping release candidates for. At least we think this issue is fixed. Please give it a try and let us know. Here are instructions on getting release candidates.