fix issue #32