Fix issue with go