Solution for #91