Update per fix for issue #5