Fix and Test for #32