fix issue #384