Change response and little bug