Proposed fix for #34