implement #82