Fix for go stuff