Fixed bug with response generator