Proposal fix to bug issue #2