Solution for #19