Fix for issue #298.