changes fixes #32