Fixed issue with incorrect response