Add solution for #168