possible fix for #127