integrated recent Gomega change