Solution for #47