temporary patch for #84, pending further investigation