Fix for issue #8.