Proposed fix for #51