Proposal fix to #164