Proposed fix for issue #32