fix issue #352