Fix issue #325