Fix pull #125