Solution for #196