Untested fix for #127