Fix to accept singular response

Added test.