Fix for go