Work with gofer 2.1