minor change on handling response