Fix for issue #39.