to fix issue #6