fix responses

Change-Id: I02acec01f323e996d986b9e68f2996f7ebc2c3d4