Proposed fix for #26