Fix for #125