implement #242