Proper fix for issue #78.