Fix for change in go-eval