Improve the #141 patch for #127