fixed to issue #325