Fix for issue #325.