Possible patch for #76