Solution for #55