Fix #151 for go