Solution for #32