CLOUD-24 type fix