Solution for #51