fix issue #30