Fix for issue #398.