Proposed fix for #31