fix fetch handler