add a clean up
fix the fetch twice bug