Fix for #125.