Fix issue #34 for response