This one is fixed on dev_4_4 on #243 so will be sorted on develop once this is merged and I can rebase it.