Solution for #27