Fix for issue #42.