Ensure the correct go is found

[jfieber]

Let me know if this is useful now, or if I should wait until the dust settles on this new extension before poking at it.

[gdamore]

Thanks! I will test it tomorrow (traveling tonight) and assuming it works I will merge and publish an update.