Proposal fix to #162