Proposed fix for gh#264