first fix for response logic