Fix to returning response