fix the change that previous one does not working