Fix + test for #90