adaption to go/types change