Solution for #73