Improve a bug when doing second request