CLOUD-39 fixed put on controllers