Solution for #29