Fixed failing on response [GH-1735]