Compile fix for either new go or new unbound
undo changes