Proposed fix for #10