fix issue #25