Solution for #33