fix issue #384

Fix issue #384