fix issue #17