proposed fix for #127