temporary patch for #107