Move unfetch to callback
Merge pull request #9 from balek/patch-2

Move unfetch to callback