Fix for issue #34.