implements #118