fixing #32