CLOUD-39 fifixed problem in handler