EHO-343 return type wasn't modified in the client