Another attempted fix for issue #2.