Fix for #127