improve(imho) solution and remove redundant fetch referenced in #6

@rglassett will you take a look and let me know if this solves your issue?