fix issue #6