fix for Golang backend