solution for #118