Hello Carl
This is a known issue (GBC-4811 and GBC-3562) we are currently working on in the current sprint. If everything is going smooth and well, you should have it fixed in our next GBC release. If not, please contact support to hae more info.
Olivier - Front-End Projects Manager.
PS- GBC-4811 is not public yet you should have it in the bug tracker tomorrow.