Move unfetch to callback