Attempted fix for issue #45.