Solution for #92