fix issue #6
fix issue #6